From 50d9484083f5bc95aa8d121714e9959c0a06f9fd Mon Sep 17 00:00:00 2001 From: =?utf8?q?Timm=20B=C3=A4der?= Date: Sat, 28 Oct 2017 11:46:35 +0200 Subject: [PATCH] Adwaita: Add back visible focus outlines for list rows --- gtk/theme/Adwaita/_common.scss | 8 ++------ gtk/theme/Adwaita/gtk-contained-dark.css | 4 +--- gtk/theme/Adwaita/gtk-contained.css | 4 +--- 3 files changed, 4 insertions(+), 12 deletions(-) diff --git a/gtk/theme/Adwaita/_common.scss b/gtk/theme/Adwaita/_common.scss index 6d44ed80f7..b1d3c9b8da 100644 --- a/gtk/theme/Adwaita/_common.scss +++ b/gtk/theme/Adwaita/_common.scss @@ -18,7 +18,8 @@ checkbutton:focus(visible), radiobutton:focus(visible), switch:focus(visible), scale:focus(visible), -label:focus(visible) { +label:focus(visible), +row:focus(visible) { // We use the outline properties to signal the focus properties // to the adwaita engine: using real CSS properties is faster, // and we don't use any outlines for now. @@ -2379,11 +2380,6 @@ scrollbar { &.left { border-right: 1px solid $borders_color; } &.right { border-left: 1px solid $borders_color; } - &:focus, - &:focus>box:focus, - &:focus>box:focus>range:focus, - &:focus>box:focus>range:focus>trough:focus{ outline: none }; - &:backdrop { background-color: $backdrop_scrollbar_bg_color; border-color: $backdrop_borders_color; diff --git a/gtk/theme/Adwaita/gtk-contained-dark.css b/gtk/theme/Adwaita/gtk-contained-dark.css index b77c052d7f..a29acde24e 100644 --- a/gtk/theme/Adwaita/gtk-contained-dark.css +++ b/gtk/theme/Adwaita/gtk-contained-dark.css @@ -1,6 +1,6 @@ * { padding: 0; -gtk-secondary-caret-color: #215d9c; } -*:focus { outline-color: alpha(currentColor,0.3); outline-style: dashed; outline-offset: -3px; outline-width: 1px; -gtk-outline-radius: 2px; } +button:focus(visible), checkbutton:focus(visible), radiobutton:focus(visible), switch:focus(visible), scale:focus(visible), label:focus(visible), row:focus(visible) { outline-color: alpha(currentColor,0.3); outline-style: dashed; outline-offset: -3px; outline-width: 1px; -gtk-outline-radius: 2px; } /*************** Base States * */ .background { color: #eeeeec; background-color: #33393b; } @@ -986,8 +986,6 @@ scrollbar.left { border-right: 1px solid #1b1f20; } scrollbar.right { border-left: 1px solid #1b1f20; } -scrollbar:focus, scrollbar:focus > box:focus, scrollbar:focus > box:focus > range:focus, scrollbar:focus > box:focus > range:focus > trough:focus { outline: none; } - scrollbar:backdrop { background-color: #2c3133; border-color: #202425; transition: 200ms ease-out; } scrollbar slider { min-width: 6px; min-height: 6px; margin: -1px; border: 4px solid transparent; border-radius: 8px; background-clip: padding-box; background-color: #a3a6a5; } diff --git a/gtk/theme/Adwaita/gtk-contained.css b/gtk/theme/Adwaita/gtk-contained.css index ab54fdbb99..a5f5ee1202 100644 --- a/gtk/theme/Adwaita/gtk-contained.css +++ b/gtk/theme/Adwaita/gtk-contained.css @@ -1,6 +1,6 @@ * { padding: 0; -gtk-secondary-caret-color: #4a90d9; } -*:focus { outline-color: alpha(currentColor,0.3); outline-style: dashed; outline-offset: -3px; outline-width: 1px; -gtk-outline-radius: 2px; } +button:focus(visible), checkbutton:focus(visible), radiobutton:focus(visible), switch:focus(visible), scale:focus(visible), label:focus(visible), row:focus(visible) { outline-color: alpha(currentColor,0.3); outline-style: dashed; outline-offset: -3px; outline-width: 1px; -gtk-outline-radius: 2px; } /*************** Base States * */ .background { color: #2e3436; background-color: #e8e8e7; } @@ -994,8 +994,6 @@ scrollbar.left { border-right: 1px solid #b6b6b3; } scrollbar.right { border-left: 1px solid #b6b6b3; } -scrollbar:focus, scrollbar:focus > box:focus, scrollbar:focus > box:focus > range:focus, scrollbar:focus > box:focus > range:focus > trough:focus { outline: none; } - scrollbar:backdrop { background-color: #e1e1df; border-color: #c0c0bd; transition: 200ms ease-out; } scrollbar slider { min-width: 6px; min-height: 6px; margin: -1px; border: 4px solid transparent; border-radius: 8px; background-clip: padding-box; background-color: #787c7d; } -- 2.30.2